Use g_get_host_name().

2005-07-08  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkfilesel.c: Use g_get_host_name().

diff --git a/ChangeLog b/ChangeLog
index f3d9a675dc6a1cafcff0f7060b988ca3cd384049..e1ae1b07c7b82601af51ab75c86c12c20bf750f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-08  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkfilesel.c: Use g_get_host_name().
+
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3d9a675dc6a1cafcff0f7060b988ca3cd384049..e1ae1b07c7b82601af51ab75c86c12c20bf750f8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-07-08  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkfilesel.c: Use g_get_host_name().
+
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f3d9a675dc6a1cafcff0f7060b988ca3cd384049..e1ae1b07c7b82601af51ab75c86c12c20bf750f8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2005-07-08  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkfilesel.c: Use g_get_host_name().
+
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index f82e81f9147a17d2451cddbd195fc1766f3c6c15..e88832cd64410c959994baf9eb50cb5e5b7230ef 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -51,9 +51,6 @@
 #include <windows.h>
 #undef STRICT
 #endif /* G_PLATFORM_WIN32 */
-#ifdef G_OS_WIN32
-#include <winsock.h>           /* For gethostname */
-#endif
 
 #include "gdk/gdkkeysyms.h"
 #include "gtkbutton.h"
@@ -940,8 +937,7 @@ filenames_dropped (GtkWidget        *widget,
   char *uri = NULL;
   char *filename = NULL;
   char *hostname;
-  char this_hostname[257];
-  int res;
+  const char *this_hostname;
   GError *error = NULL;
        
   if (!selection_data->data)
@@ -963,11 +959,10 @@ filenames_dropped (GtkWidget        *widget,
       return;
     }
 
-  res = gethostname (this_hostname, 256);
-  this_hostname[256] = 0;
+  this_hostname = g_get_host_name ();
   
   if ((hostname == NULL) ||
-      (res == 0 && strcmp (hostname, this_hostname) == 0) ||
+      (strcmp (hostname, this_hostname) == 0) ||
       (strcmp (hostname, "localhost") == 0))
     gtk_file_selection_set_filename (GTK_FILE_SELECTION (widget),
                                     filename);
@@ -1023,8 +1018,7 @@ filenames_drag_get (GtkWidget        *widget,
 {
   const gchar *file;
   gchar *uri_list;
-  char hostname[256];
-  int res;
+  const char *hostname;
   GError *error;
 
   file = gtk_file_selection_get_filename (filesel);
@@ -1033,10 +1027,10 @@ filenames_drag_get (GtkWidget        *widget,
     {
       if (info == TARGET_URILIST)
        {
-         res = gethostname (hostname, 256);
+         hostname = g_get_host_name ();
          
          error = NULL;
-         uri_list = g_filename_to_uri (file, (!res)?hostname:NULL, &error);
+         uri_list = g_filename_to_uri (file, hostname, &error);
          if (!uri_list)
            {
              g_warning ("Error getting filename: %s\n",